droptarget: Rename :drop to :current-drop

Rename the GtkDropTraget:drop property to :current-drop,
to avoid naming collision with the signal of the same
name.

We leave the old property and getter in place, deprecated
and marked as non-introspectable.

Fixes: #4028

diff --git a/gtk/gtkdroptarget.c b/gtk/gtkdroptarget.c
index 24ff0427c2a918de0fc2d60be798b249fd8b1788..4012a4192891327f821686ba43d2f12c5d973092 100644 (file)
--- a/gtk/gtkdroptarget.c
+++ b/gtk/gtkdroptarget.c
@@ -148,6 +148,7 @@ struct _GtkDropTargetClass
 enum {
   PROP_0,
   PROP_ACTIONS,
+  PROP_CURRENT_DROP,
   PROP_DROP,
   PROP_FORMATS,
   PROP_PRELOAD,
@@ -186,6 +187,7 @@ gtk_drop_target_end_drop (GtkDropTarget *self)
 
   g_clear_object (&self->drop);
   g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_DROP]);
+  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_CURRENT_DROP]);
 
   if (G_IS_VALUE (&self->value))
     {
@@ -320,6 +322,7 @@ gtk_drop_target_start_drop (GtkDropTarget *self,
 
   self->drop = g_object_ref (drop);
   g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_DROP]);
+  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_CURRENT_DROP]);
 
   if (self->preload)
     gtk_drop_target_load (self);
@@ -565,6 +568,7 @@ gtk_drop_target_get_property (GObject    *object,
       break;
 
     case PROP_DROP:
+    case PROP_CURRENT_DROP:
       g_value_set_object (value, self->drop);
       break;
 
@@ -620,15 +624,31 @@ gtk_drop_target_class_init (GtkDropTargetClass *class)
                            G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY);
 
   /**
-   * GtkDropTarget:drop: (attributes org.gtk.Property.get=gtk_drop_target_get_drop)
+   * GtkDropTarget:drop: (attributes org.gtk.Property.get=gtk_drop_target_get_drop) (skip)
    *
    * The `GdkDrop` that is currently being performed.
+   *
+   * Deprecated: 4.4: Use [property@Gtk.DropTarget:current-drop] instead
    */
   properties[PROP_DROP] =
        g_param_spec_object ("drop",
                             P_("Drop"),
                             P_("Current drop"),
                             GDK_TYPE_DROP,
+                            GTK_PARAM_READABLE | G_PARAM_DEPRECATED);
+
+  /**
+   * GtkDropTarget:current-drop: (attributes org.gtk.Property.get=gtk_drop_target_get_current_drop)
+   *
+   * The `GdkDrop` that is currently being performed.
+   *
+   * Since: 4.4
+   */
+  properties[PROP_CURRENT_DROP] =
+       g_param_spec_object ("current-drop",
+                            P_("Current drop"),
+                            P_("Current drop"),
+                            GDK_TYPE_DROP,
                             GTK_PARAM_READABLE);
 
   /**
@@ -1010,6 +1030,8 @@ gtk_drop_target_get_preload (GtkDropTarget *self)
  * If no drop operation is going on, %NULL is returned.
  *
  * Returns: (nullable) (transfer none): The current drop
+ *
+ * Deprecated: 4.4: Use [method@Gtk.DropTarget.get_current_drop] instead
  */
 GdkDrop *
 gtk_drop_target_get_drop (GtkDropTarget *self)
@@ -1019,6 +1041,26 @@ gtk_drop_target_get_drop (GtkDropTarget *self)
   return self->drop;
 }
 
+/**
+ * gtk_drop_target_get_current_drop: (attributes org.gtk.Method.get_property=current-drop)
+ * @self: a `GtkDropTarget`
+ *
+ * Gets the currently handled drop operation.
+ *
+ * If no drop operation is going on, %NULL is returned.
+ *
+ * Returns: (nullable) (transfer none): The current drop
+ *
+ * Since: 4.4
+ */
+GdkDrop *
+gtk_drop_target_get_current_drop (GtkDropTarget *self)
+{
+  g_return_val_if_fail (GTK_IS_DROP_TARGET (self), NULL);
+
+  return self->drop;
+}
+
 /**
  * gtk_drop_target_get_value: (attributes org.gtk.Method.get_property=value)
  * @self: a `GtkDropTarget`
@@ -1044,7 +1086,7 @@ gtk_drop_target_get_value (GtkDropTarget *self)
  *
  * Rejects the ongoing drop operation.
  *
- * If no drop operation is ongoing, i.e when [property@Gtk.DropTarget:drop]
+ * If no drop operation is ongoing, i.e when [property@Gtk.DropTarget:current-drop]
  * is %NULL, this function does nothing.
  *
  * This function should be used when delaying the decision
@@ -1061,3 +1103,4 @@ gtk_drop_target_reject (GtkDropTarget *self)
 
   gtk_drop_target_end_drop (self);
 }
+

diff --git a/gtk/gtkdroptarget.h b/gtk/gtkdroptarget.h
index 4020f1564836897260cbf381c227458d2879733b..12e652a533a54b276ca4aa13300212660e0d301b 100644 (file)
--- a/gtk/gtkdroptarget.h
+++ b/gtk/gtkdroptarget.h
@@ -71,9 +71,12 @@ void                    gtk_drop_target_set_preload      (GtkDropTarget
 GDK_AVAILABLE_IN_ALL
 gboolean                gtk_drop_target_get_preload      (GtkDropTarget         *self);
 
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_4_4_FOR(gtk_drop_target_get_current_drop)
 GdkDrop *               gtk_drop_target_get_drop         (GtkDropTarget         *self);
 
+GDK_AVAILABLE_IN_4_4
+GdkDrop *               gtk_drop_target_get_current_drop (GtkDropTarget         *self);
+
 GDK_AVAILABLE_IN_ALL
 const GValue *          gtk_drop_target_get_value        (GtkDropTarget         *self);
 

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 57b87f5f2ebcf029e21d2d6330873a948efdb6a8..76115f09c6a2c292bd4f303d835348b6f03e7a1c 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -3379,7 +3379,7 @@ gtk_notebook_drag_motion (GtkDropTarget *dest,
                           double         y,
                           GtkNotebook   *notebook)
 {
-  GdkDrag *drag = gdk_drop_get_drag (gtk_drop_target_get_drop (dest));
+  GdkDrag *drag = gdk_drop_get_drag (gtk_drop_target_get_current_drop (dest));
   GtkNotebook *source;
 
   notebook->mouse_x = x;
@@ -3404,7 +3404,7 @@ gtk_notebook_drag_drop (GtkDropTarget *dest,
                         double         y,
                         GtkNotebook   *self)
 {
-  GdkDrag *drag = gdk_drop_get_drag (gtk_drop_target_get_drop (dest));
+  GdkDrag *drag = gdk_drop_get_drag (gtk_drop_target_get_current_drop (dest));
   GtkNotebook *source;
   GtkNotebookPage *page = g_value_get_object (value);
 

diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c
index d4a1f74e5da6bbafbf1996c66621f75923016fff..f1081bfd7cbda7e307f92b2e44b53196c5ac6340 100644 (file)
--- a/gtk/gtkplacessidebar.c
+++ b/gtk/gtkplacessidebar.c
@@ -1851,7 +1851,7 @@ drag_drop_callback (GtkDropTarget    *target,
           emit_drag_perform_drop (sidebar,
                                   dest_file,
                                   g_value_get_boxed (value),
-                                  gdk_drop_get_actions (gtk_drop_target_get_drop (target)));
+                                  gdk_drop_get_actions (gtk_drop_target_get_current_drop (target)));
 
           g_object_unref (dest_file);
         }